Fix compiler warnings.
authorCarlos Garnacho <carlosg@gnome.org>
Wed, 1 Dec 2010 00:19:24 +0000 (01:19 +0100)
committerCarlos Garnacho <carlosg@gnome.org>
Sat, 4 Dec 2010 14:39:52 +0000 (15:39 +0100)
gtk/gtkcssprovider.c
gtk/gtkicontheme.c

index afc8340c58f90101bd7e0bace2033c371131c353..35e94e8fafb86034c6deff52ff60fc961f3766aa 100644 (file)
@@ -1366,8 +1366,8 @@ gtk_css_provider_get_style_property (GtkStyleProvider *provider,
       if (val &&
           (info->state == 0 ||
            info->state == state ||
-           (info->state & state) != 0 &&
-           (info->state & ~(state)) == 0))
+           ((info->state & state) != 0 &&
+           (info->state & ~(state)) == 0)))
         {
           const gchar *val_str;
 
index 1b6f1e598605c7bcdbcf94d863e68e1170d122ea..c4cefe6abde13307e2da564024794933535c87b8 100644 (file)
@@ -3275,7 +3275,7 @@ gtk_icon_info_load_symbolic_for_context (GtkIconInfo      *icon_info,
   GdkPixbuf *pixbuf;
   GdkRGBA *color = NULL;
   GdkRGBA rgba;
-  gchar *css_fg, *css_success;
+  gchar *css_fg = NULL, *css_success;
   gchar *css_warning, *css_error;
   GtkStateFlags state;